Enable resetting config values to default value by ravening · Pull Request #4230 · apache/cloudstack

ravening · 2020-07-29T11:51:58Z

Description

Provide reset button to zone,cluster,domain,account,
primary and secondary storage so that config values
can be reset to the default value

Depends on #4215

Types of changes

Enhancement (improves an existing feature and functionality)

Screenshots (if appropriate):

Reset button has been provided under zone,cluster, domain, account, primary storage and secondary storage level

How Has This Been Tested?

Tested throguh cmk also

(local) mgt01 > list configurations name=allow.user.expunge.recover.vm accountid=4048bfec-c28e-11ea-9a43-0617bc003377
{
  "configuration": [
    {
      "category": "Advanced",
      "description": "Determines whether users can expunge or recover their vm",
      "isdynamic": true,
      "name": "allow.user.expunge.recover.vm",
      "scope": "account",
      "value": "false"
    }
  ],
  "count": 1
}
(local) mgt01 > update configuration name=allow.user.expunge.recover.vm accountid=4048bfec-c28e-11ea-9a43-0617bc003377 value=true
{
  "configuration": {
    "category": "Advanced",
    "description": "Determines whether users can expunge or recover their vm",
    "isdynamic": true,
    "name": "allow.user.expunge.recover.vm",
    "scope": "account",
    "value": "true"
  }
}

(local) mgt01 > reset configuration name=allow.user.expunge.recover.vm accountid=4048bfec-c28e-11ea-9a43-0617bc003377
{
  "configuration": {
    "category": "Advanced",
    "description": "Determines whether users can expunge or recover their vm",
    "isdynamic": true,
    "name": "allow.user.expunge.recover.vm",
    "scope": "account",
    "value": "false"
  }
}
(local) mgt01 > list configurations name=allow.user.expunge.recover.vm accountid=4048bfec-c28e-11ea-9a43-0617bc003377
{
  "configuration": [
    {
      "category": "Advanced",
      "description": "Determines whether users can expunge or recover their vm",
      "isdynamic": true,
      "name": "allow.user.expunge.recover.vm",
      "scope": "account",
      "value": "false"
    }
  ],
  "count": 1
}

Run integration test case using

nosetests --with-marvin --marvin-config=<cfg file> test_reset_configuration_settings.py

DaanHoogland

one question and a general remark: scopes are a enum, so I think string compares using contains() should be avoided.

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

DaanHoogland

testing required, good looking

yadvr · 2020-08-05T08:28:46Z

@blueorangutan package

blueorangutan · 2020-08-05T08:29:57Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2020-08-05T08:47:02Z

Packaging result: ✖centos7 ✖debian. JID-1655

ravening · 2020-08-05T08:57:42Z

@rhtyd dont merge this as this depends on #4215

RodrigoDLopez

Hi @ravening
Nice feature, I think you could break some code into smaller pieces, add some documentation and unit tests. Small method is easy to make unit tests , and with unit tests, future new codes do not need to be manually tested every time
I did not run manual tests yet, but I will do it soon, into the next days, I hope.

engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

yadvr · 2020-08-14T07:36:48Z

@ravening is this ready for review? (PR still in draft)

ravening · 2020-08-14T07:38:09Z

@rhtyd yes it's ready for review. It's marked as draft because it can't be merged unless other is merged

yadvr · 2020-08-14T09:46:40Z

@ravening can you check Travis failures

ravening · 2020-08-14T09:49:26Z

@ravening can you check Travis failures

@rhtyd the build will fail since some functions are missing.
Those functions are defined in another pr

…omain settings

… under domain settings" This reverts commit 0ecdaeb.

DaanHoogland · 2020-10-06T11:50:22Z

@ravening marking this 4.16 as it is waiting on dependencies. please argue if you disagree.

ravening · 2020-10-06T12:32:05Z

@ravening marking this 4.16 as it is waiting on dependencies. please argue if you disagree.

I prefer if it can go in 4.15.

DaanHoogland · 2020-10-06T12:45:56Z

@ravening marking this 4.16 as it is waiting on dependencies. please argue if you disagree.

I prefer if it can go in 4.15.

I assumed as much but than can you push for any prerequisite work as well, please? ( I want/prefer is not the argument I was hoping for ;)

yadvr · 2020-10-28T10:17:47Z

@ravening is this still in progress, opened as a draft?

ravening · 2020-10-28T12:30:17Z

@ravening is this still in progress, opened as a draft?

@rhtyd yes ready for review but depends on #4215

DaanHoogland · 2020-10-28T13:24:59Z

@ravening is this still in progress, opened as a draft?

@rhtyd yes ready for review but depends on #4215

@ravening is the code depending on #4215 or you use-case?

ravening · 2020-10-28T13:27:04Z

@ravening is this still in progress, opened as a draft?

@rhtyd yes ready for review but depends on #4215

@ravening is the code depending on #4215 or you use-case?

@DaanHoogland yes it depends on other pr as some functions are defined there

yadvr · 2021-02-12T07:07:13Z

@ravening can you fix conflicts, re-send for latest master with changes in the UI (not legacy UI)

blueorangutan · 2021-11-22T13:26:34Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 1761

DaanHoogland · 2021-11-22T14:13:16Z

@blueorangutan test

blueorangutan · 2021-11-22T14:14:03Z

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2021-11-22T23:15:49Z

Trillian test result (tid-2574)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31189 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4230-t2574-kvm-centos7.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland · 2021-11-23T10:24:30Z

@ravening @sureshanaparti is this ready for merge now?

sureshanaparti · 2021-12-20T05:57:29Z

@blueorangutan package

blueorangutan · 2021-12-20T05:58:03Z

@sureshanaparti a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-12-20T06:41:22Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 1952

sureshanaparti · 2021-12-20T07:14:57Z

@blueorangutan test

yadvr · 2021-12-30T11:18:33Z

Ping @ravening is this ready for review/testing, needs any rebasing or fixing?
@blueorangutan package

blueorangutan · 2021-12-30T11:19:02Z

@rohityadavcloud a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-12-30T12:43:48Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 2043

DaanHoogland · 2021-12-31T08:59:17Z

@blueorangutan package

blueorangutan · 2021-12-31T09:02:02Z

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-12-31T11:05:17Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 2054

DaanHoogland · 2021-12-31T12:11:03Z

@blueorangutan test

blueorangutan · 2021-12-31T12:12:03Z

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

test/integration/smoke/test_reset_configuration_settings.py

blueorangutan · 2021-12-31T21:25:07Z

Trillian test result (tid-2760)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31687 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4230-t2760-kvm-centos7.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

sureshanaparti · 2022-01-03T07:15:23Z

@blueorangutan package

blueorangutan · 2022-01-03T07:17:03Z

@sureshanaparti a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2022-01-03T08:51:14Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 2064

sureshanaparti · 2022-01-03T09:37:23Z

@blueorangutan test

blueorangutan · 2022-01-03T09:38:03Z

@sureshanaparti a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2022-01-03T18:41:52Z

Trillian test result (tid-2767)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31131 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4230-t2767-kvm-centos7.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland reviewed Jul 29, 2020

View reviewed changes

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

svenvogel added component:management-server type:enhancement labels Jul 30, 2020

DaanHoogland approved these changes Aug 4, 2020

View reviewed changes

DaanHoogland marked this pull request as draft August 5, 2020 09:58

RodrigoDLopez suggested changes Aug 5, 2020

View reviewed changes

ravening force-pushed the reset_cfg branch from 5c18873 to 2ff0abf Compare August 6, 2020 09:19

RodrigoDLopez approved these changes Aug 6, 2020

View reviewed changes

ustcweizhou added a commit to ravening/cloudstack that referenced this pull request Oct 6, 2020

apache#4230 apache#4215 Reset account settings which visible under d…

0ecdaeb

…omain settings

ustcweizhou added a commit to ravening/cloudstack that referenced this pull request Oct 6, 2020

Revert " apache#4230 apache#4215 Reset account settings which visible…

3970f8d

… under domain settings" This reverts commit 0ecdaeb.

DaanHoogland added this to the 4.16.0.0 milestone Oct 6, 2020

ravening force-pushed the reset_cfg branch from c6fa9f4 to 8b2a6b1 Compare October 28, 2020 12:29

ravening marked this pull request as ready for review October 28, 2020 12:29

weizhouapache approved these changes Nov 17, 2020

View reviewed changes

DaanHoogland reviewed Dec 31, 2021

View reviewed changes

test/integration/smoke/test_reset_configuration_settings.py Outdated Show resolved Hide resolved

DaanHoogland reviewed Dec 31, 2021

View reviewed changes

test/integration/smoke/test_reset_configuration_settings.py Show resolved Hide resolved

DaanHoogland added 2 commits December 31, 2021 13:22

Update test/integration/smoke/test_reset_configuration_settings.py

e73c54b

Update test/integration/smoke/test_reset_configuration_settings.py

4c96d26

DaanHoogland merged commit 2bd1dc1 into apache:4.16 Jan 3, 2022

weizhouapache mentioned this pull request Mar 28, 2022

api: Fix reset configuration #6168

Merged

10 tasks

Conversation

ravening commented Jul 29, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

yadvr commented Aug 5, 2020

Uh oh!

blueorangutan commented Aug 5, 2020

Uh oh!

blueorangutan commented Aug 5, 2020

Uh oh!

ravening commented Aug 5, 2020

Uh oh!

RodrigoDLopez left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yadvr commented Aug 14, 2020

Uh oh!

ravening commented Aug 14, 2020

Uh oh!

yadvr commented Aug 14, 2020

Uh oh!

ravening commented Aug 14, 2020

Uh oh!

DaanHoogland commented Oct 6, 2020

Uh oh!

ravening commented Oct 6, 2020

Uh oh!

DaanHoogland commented Oct 6, 2020

Uh oh!

yadvr commented Oct 28, 2020

Uh oh!

ravening commented Oct 28, 2020

Uh oh!

DaanHoogland commented Oct 28, 2020

Uh oh!

ravening commented Oct 28, 2020

Uh oh!

yadvr commented Feb 12, 2021

Uh oh!

blueorangutan commented Nov 22, 2021

Uh oh!

DaanHoogland commented Nov 22, 2021

Uh oh!

blueorangutan commented Nov 22, 2021

Uh oh!

blueorangutan commented Nov 22, 2021

Uh oh!

DaanHoogland commented Nov 23, 2021

Uh oh!

sureshanaparti commented Dec 20, 2021

Uh oh!

blueorangutan commented Dec 20, 2021

Uh oh!

blueorangutan commented Dec 20, 2021

Uh oh!

sureshanaparti commented Dec 20, 2021

Uh oh!

yadvr commented Dec 30, 2021

Uh oh!

blueorangutan commented Dec 30, 2021

Uh oh!

blueorangutan commented Dec 30, 2021

Uh oh!

DaanHoogland commented Dec 31, 2021

ravening commented Jul 29, 2020 •

edited

Loading

RodrigoDLopez left a comment •

edited

Loading